97. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:45 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

97.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/importdemo01_old.xml2019-12-13 09:03:12 +0000
22021-05-13 09:08:45 +0000

97.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1781

97.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

97.4 Active regular expressions

No regular expressions were active.

97.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_1_old    
10     </cms_home_page>    
11                     
12     <cms_no_route>    
13      no-route-2    
14     </cms_no_route>    
15                 
16    </default>    
17            
18   </web>    
19           
20   <cms>    
21                
22    <wysiwyg>    
23                     
24     <enabled>    
25      hidden    
26     </enabled>    
27                 
28    </wysiwyg>    
29            
30   </cms>    
31   »           
32   <design>    
33    »       »           
34    <header>    
35     »       »       »           
36     <logo_width>    
37     </logo_width>    
38     »       »       »           
39     <logo_height>    
40     </logo_height>    
41     »       »       »           
42     <logo_src>    
43      default/logo_white.png    
44     </logo_src>    
45     »       »           
46    </header>    
47    »           
48   </design>    
49   »           
50   <dev>    
51    »       »           
52    <js>    
53     »       »       »           
54     <merge_files>    
55      1    
56     </merge_files>    
57     »       »           
58    </js>    
59    »           
60   </dev>    
61           
62   <porto_settings>    
63                
64    <general>    
65                     
66     <boxed>    
67      wide    
68     </boxed>    
69                     
70     <layout>    
71      1140    
72     </layout>    
73                     
74     <disable_border_radius>    
75      0    
76     </disable_border_radius>    
77                     
78     <show_site_notice>    
79      0    
80     </show_site_notice>    
81                 
82    </general>    
83                
84    <header>    
85                     
86     <header_type>    
87      3    
88     </header_type>    
89                     
90     <static_block>    
91      porto_custom_block_for_header    
92     </static_block>    
93                     
94     <sticky_header_logo>    
95     </sticky_header_logo>    
96                 
97    </header>    
98                
99    <footer>    
100                     
101     <footer_top>    
102      0    
103     </footer_top>    
104                     
105     <footer_top_block>    
106      custom    
107     </footer_top_block>    
108                     
109     <footer_top_custom>    
110      porto_footer_top_custom_block    
111     </footer_top_custom>    
112                     
113     <footer_middle>    
114      1    
115     </footer_middle>    
116                     
117     <footer_ribbon>    
118      1    
119     </footer_ribbon>    
120                     
121     <footer_ribbon_text>    
122      Ribbon Text    
123     </footer_ribbon_text>    
124                     
125     <footer_middle_column_1>    
126      custom    
127     </footer_middle_column_1>    
128                     
129     <footer_middle_column_1_custom>    
130      porto_footer_links    
131     </footer_middle_column_1_custom>    
132                     
133     <footer_middle_column_1_size>    
134      3    
135     </footer_middle_column_1_size>    
136                     
137     <footer_middle_column_2>    
138      custom    
139     </footer_middle_column_2>    
140                     
141     <footer_middle_column_2_custom>    
142      porto_footer_contact_information    
143     </footer_middle_column_2_custom>    
144                     
145     <footer_middle_column_2_size>    
146      3    
147     </footer_middle_column_2_size>    
148                     
149     <footer_middle_column_3>    
150      custom    
151     </footer_middle_column_3>    
152                     
153     <footer_middle_column_3_custom>    
154      porto_footer_features    
155     </footer_middle_column_3_custom>    
156                     
157     <footer_middle_column_3_size>    
158      3    
159     </footer_middle_column_3_size>    
160                     
161     <footer_middle_column_4>    
162      newsletter    
163     </footer_middle_column_4>    
164                     
165     <footer_middle_column_4_custom>    
166      porto_footer_links    
167     </footer_middle_column_4_custom>    
168                     
169     <footer_middle_column_4_size>    
170      3    
171     </footer_middle_column_4_size>    
172                     
173     <footer_middle_2>    
174      0    
175     </footer_middle_2>    
176                     
177     <footer_middle_2_column_1>    
178      custom    
179     </footer_middle_2_column_1>    
180                     
181     <footer_middle_2_column_1_custom>    
182      porto_footer_links    
183     </footer_middle_2_column_1_custom>    
184                     
185     <footer_middle_2_column_1_size>    
186      3    
187     </footer_middle_2_column_1_size>    
188                     
189     <footer_middle_2_column_2>    
190      custom    
191     </footer_middle_2_column_2>    
192                     
193     <footer_middle_2_column_2_custom>    
194      porto_footer_links    
195     </footer_middle_2_column_2_custom>    
196                     
197     <footer_middle_2_column_2_size>    
198      3    
199     </footer_middle_2_column_2_size>    
200                     
201     <footer_middle_2_column_3>    
202      custom    
203     </footer_middle_2_column_3>    
204                     
205     <footer_middle_2_column_3_custom>    
206      porto_footer_links    
207     </footer_middle_2_column_3_custom>    
208                     
209     <footer_middle_2_column_3_size>    
210      3    
211     </footer_middle_2_column_3_size>    
212                     
213     <footer_middle_2_column_4>    
214      custom    
215     </footer_middle_2_column_4>    
216                     
217     <footer_middle_2_column_4_custom>    
218      porto_footer_links    
219     </footer_middle_2_column_4_custom>    
220                     
221     <footer_middle_2_column_4_size>    
222      3    
223     </footer_middle_2_column_4_size>    
224                     
225     <footer_bottom>    
226      1    
227     </footer_bottom>    
228                     
229     <footer_store_switcher>    
230      0    
231     </footer_store_switcher>    
232                     
233     <footer_logo_src>    
234     </footer_logo_src>    
235                     
236     <footer_bottom_copyrights>    
237      <![CDATA[&copy;Copyright 2020 PORTO. All Rights Reserved.]]>    
238     </footer_bottom_copyrights>    
239                     
240     <footer_bottom_custom_1>    
241      porto_footer_bottom_custom_block_1_1    
242     </footer_bottom_custom_1>    
243                     
244     <footer_bottom_custom_2>    
245      porto_footer_bottom_custom_block_2_1    
246     </footer_bottom_custom_2>    
247                 
248    </footer>    
249                
250    <category>    
251                     
252     <alternative_image>    
253      1    
254     </alternative_image>    
255                     
256     <aspect_ratio>    
257      0    
258     </aspect_ratio>    
259                     
260     <ratio_width>    
261      300    
262     </ratio_width>    
263                     
264     <ratio_height>    
265      400    
266     </ratio_height>    
267                     
268     <rating_star>    
269      1    
270     </rating_star>    
271                     
272     <product_price>    
273      1    
274     </product_price>    
275                     
276     <actions>    
277      1    
278     </actions>    
279                     
280     <addtocompare>    
281      1    
282     </addtocompare>    
283                     
284     <addtowishlist>    
285      1    
286     </addtowishlist>    
287                     
288     <page_layout>    
289      2columns-left    
290     </page_layout>    
291                     
292     <category_description>    
293      main_column    
294     </category_description>    
295                     
296     <side_custom_block>    
297      porto_category_side_custom_block    
298     </side_custom_block>    
299                 
300    </category>    
301                
302    <category_grid>    
303                     
304     <product_type>    
305      3    
306     </product_type>    
307                     
308     <columns>    
309      4    
310     </columns>    
311                     
312     <move_actions>    
313      0    
314     </move_actions>    
315                 
316    </category_grid>    
317                
318    <product>    
319                     
320     <product_image_size>    
321      6    
322     </product_image_size>    
323                     
324     <side_custom_block>    
325      porto_product_side_custom_block    
326     </side_custom_block>    
327                     
328     <main_custom_block>    
329     </main_custom_block>    
330                     
331     <main_custom_block2>    
332     </main_custom_block2>    
333                     
334     <move_addtolinks>    
335      0    
336     </move_addtolinks>    
337                     
338     <move_upsell_full>    
339      0    
340     </move_upsell_full>    
341                     
342     <page_layout>    
343      2columns-right    
344     </page_layout>    
345                     
346     <tab_full_background>    
347      0    
348     </tab_full_background>    
349                     
350     <custom_block_next_tab>    
351     </custom_block_next_tab>    
352                     
353     <upsell_columns>    
354      4    
355     </upsell_columns>    
356                     
357     <move_upsell>    
358      0    
359     </move_upsell>    
360                 
361    </product>    
362    »       »           
363    <newsletter>    
364     »       »       »           
365     <logo_src>    
366      default/logo_black.png    
367     </logo_src>    
368     »       »           
369    </newsletter>    
370                
371    <contacts>    
372                     
373     <enable>    
374      1    
375     </enable>    
376                     
377     <full_width>    
378      0    
379     </full_width>    
380                     
381     <address>    
382      Porto2 Store    
383     </address>    
384                     
385     <latitude>    
386      -34.398    
387     </latitude>    
388                     
389     <longitude>    
390      150.884    
391     </longitude>    
392                     
393     <zoom>    
394      18    
395     </zoom>    
396                     
397     <infoblock>    
398      <![CDATA[<div class="row">    
399      <div class="col-md-12">    
400          <i class="porto-icon-phone"></i>    
401          <p>0201 203 2032</p>    
402          <p>0201 203 2032</p>    
403      </div>    
404      </div>    
405      <div class="row">    
406      <div class="col-md-12">    
407          <i class="porto-icon-mobile"></i>    
408          <p>201-123-3922</p>    
409          <p>302-123-3928</p>    
410      </div>    
411      </div>    
412      <div class="row">    
413      <div class="col-md-12">    
414          <i class="porto-icon-mail-alt"></i>    
415          <p>porto@gmail.com</p>    
416          <p>porto@portotemplate.com</p>    
417      </div>    
418      </div>    
419      <div class="row">    
420      <div class="col-md-12">    
421          <i class="porto-icon-skype"></i>    
422          <p>porto_skype</p>    
423          <p>proto_template</p>    
424      </div>    
425      </div>]]>    
426     </infoblock>    
427                     
428     <customblock>    
429     </customblock>    
430                 
431    </contacts>    
432                
433    <custom_settings>    
434                     
435     <custom_style>    
436      <![CDATA[@media (max-width: 768px) {    
437          .nav-toggle:before, .nav-toggle:hover:before, .page-header.type3 .block-search .label:before, .page-header.type3 .block-search .label:hover:before, .page-header.type3 .minicart-wrapper .action.showcart:before {    
438              color: #fff;    
439          }    
440          .page-header.type3 .minicart-wrapper .action.showcart .counter.qty {    
441              color: #313131;    
442          }    
443      }    
444      .page-wrapper > .breadcrumbs {    
445          max-width: 100% !important;    
446      }    
447      .block-category-list {    
448          margin-bottom: 15px;    
449      }    
450      .products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {    
451          border-radius: 0 0 5px 5px;    
452          font-family: "Open Sans";    
453          letter-spacing: 0;    
454      }    
455      .price-box .price {    
456          font-family: "Open Sans";    
457          font-weight: 600;    
458      }]]>    
459     </custom_style>    
460                     
461     <custom_style_2>    
462      <![CDATA[]]>    
463     </custom_style_2>    
464                 
465    </custom_settings>    
466            
467   </porto_settings>    
468           
469   <porto_design>    
470                
471    <general>    
472                     
473     <theme_color>    
474      313131    
475     </theme_color>    
476                 
477    </general>    
478                
479    <font>    
480                     
481     <custom>    
482      0    
483     </custom>    
484                     
485     <font_size>    
486     </font_size>    
487                     
488     <font_family>    
489     </font_family>    
490                     
491     <custom_font_family>    
492     </custom_font_family>    
493                     
494     <google_font_family>    
495     </google_font_family>    
496                     
497     <char_latin_ext>    
498     </char_latin_ext>    
499                     
500     <char_subset>    
501     </char_subset>    
502                 
503    </font>    
504                
505    <colors>    
506                     
507     <custom>    
508      0    
509     </custom>    
510                     
511     <text_color>    
512     </text_color>    
513                     
514     <link_color>    
515     </link_color>    
516                     
517     <link_hover_color>    
518     </link_hover_color>    
519                     
520     <button_bg_color>    
521     </button_bg_color>    
522                     
523     <button_text_color>    
524     </button_text_color>    
525                     
526     <button_hover_bg_color>    
527     </button_hover_bg_color>    
528                     
529     <button_hover_text_color>    
530     </button_hover_text_color>    
531                     
532     <addtowishlist_color>    
533     </addtowishlist_color>    
534                     
535     <addtowishlist_hover_color>    
536     </addtowishlist_hover_color>    
537                     
538     <addtocompare_color>    
539     </addtocompare_color>    
540                     
541     <addtocompare_hover_color>    
542     </addtocompare_hover_color>    
543                     
544     <breadcrumbs_bg_color>    
545     </breadcrumbs_bg_color>    
546                     
547     <breadcrumbs_color>    
548     </breadcrumbs_color>    
549                     
550     <breadcrumbs_links_color>    
551     </breadcrumbs_links_color>    
552                     
553     <breadcrumbs_links_hover_color>    
554     </breadcrumbs_links_hover_color>    
555                     
556     <sale_bg_color>    
557     </sale_bg_color>    
558                     
559     <sale_font_color>    
560     </sale_font_color>    
561                     
562     <new_bg_color>    
563     </new_bg_color>    
564                     
565     <new_font_color>    
566     </new_font_color>    
567                     
568     <price_slider_bg_color>    
569      333    
570     </price_slider_bg_color>    
571                     
572     <price_slider_handle_color>    
573      333    
574     </price_slider_handle_color>    
575                 
576    </colors>    
577                
578    <header>    
579                     
580     <custom>    
581      1    
582     </custom>    
583                     
584     <header_bgcolor>    
585     </header_bgcolor>    
586                     
587     <header_bg_image>    
588     </header_bg_image>    
589                     
590     <header_bordercolor>    
591     </header_bordercolor>    
592                     
593     <header_textcolor>    
594     </header_textcolor>    
595                     
596     <header_linkcolor>    
597     </header_linkcolor>    
598                     
599     <header_top_links_bgcolor>    
600     </header_top_links_bgcolor>    
601                     
602     <header_top_links_color>    
603      FFFFFF    
604     </header_top_links_color>    
605                     
606     <header_menu_bgcolor>    
607     </header_menu_bgcolor>    
608                     
609     <header_menu_color>    
610     </header_menu_color>    
611                     
612     <header_menu_hover_bgcolor>    
613     </header_menu_hover_bgcolor>    
614                     
615     <header_menu_hover_color>    
616     </header_menu_hover_color>    
617                     
618     <header_menu_classicmenu_bgcolor>    
619     </header_menu_classicmenu_bgcolor>    
620                     
621     <header_menu_classicmenu_bordercolor>    
622     </header_menu_classicmenu_bordercolor>    
623                     
624     <header_menu_classicmenu_color>    
625     </header_menu_classicmenu_color>    
626                     
627     <header_menu_classicmenu_hover_bgcolor>    
628     </header_menu_classicmenu_hover_bgcolor>    
629                     
630     <header_menu_classicmenu_hover_color>    
631     </header_menu_classicmenu_hover_color>    
632                     
633     <header_search_bgcolor>    
634     </header_search_bgcolor>    
635                     
636     <header_search_text_color>    
637     </header_search_text_color>    
638                     
639     <header_search_bordercolor>    
640     </header_search_bordercolor>    
641                     
642     <header_minicart_bgcolor>    
643     </header_minicart_bgcolor>    
644                     
645     <header_minicart_color>    
646     </header_minicart_color>    
647                     
648     <header_minicart_icon_color>    
649     </header_minicart_icon_color>    
650                 
651    </header>    
652                
653    <footer>    
654                     
655     <custom>    
656      1    
657     </custom>    
658                     
659     <footer_top_bgcolor>    
660     </footer_top_bgcolor>    
661                     
662     <footer_top_color>    
663     </footer_top_color>    
664                     
665     <footer_top_link_color>    
666     </footer_top_link_color>    
667                     
668     <footer_top_link_hover_color>    
669     </footer_top_link_hover_color>    
670                     
671     <footer_middle_bgcolor>    
672     </footer_middle_bgcolor>    
673                     
674     <footer_middle_color>    
675     </footer_middle_color>    
676                     
677     <footer_middle_link_color>    
678     </footer_middle_link_color>    
679                     
680     <footer_middle_link_hover_color>    
681     </footer_middle_link_hover_color>    
682                     
683     <footer_middle_title_color>    
684     </footer_middle_title_color>    
685                     
686     <footer_middle_links_icon_color>    
687     </footer_middle_links_icon_color>    
688                     
689     <footer_middle_ribbon_bgcolor>    
690     </footer_middle_ribbon_bgcolor>    
691                     
692     <footer_middle_ribbon_shadow_color>    
693      222222    
694     </footer_middle_ribbon_shadow_color>    
695                     
696     <footer_middle_ribbon_color>    
697     </footer_middle_ribbon_color>    
698                     
699     <footer_middle_2_bgcolor>    
700     </footer_middle_2_bgcolor>    
701                     
702     <footer_middle_2_color>    
703     </footer_middle_2_color>    
704                     
705     <footer_middle_2_link_color>    
706     </footer_middle_2_link_color>    
707                     
708     <footer_middle_2_link_hover_color>    
709     </footer_middle_2_link_hover_color>    
710                     
711     <footer_middle_2_title_color>    
712     </footer_middle_2_title_color>    
713                     
714     <footer_middle_2_links_icon_color>    
715     </footer_middle_2_links_icon_color>    
716                     
717     <footer_bottom_bgcolor>    
718     </footer_bottom_bgcolor>    
719                     
720     <footer_bottom_color>    
721     </footer_bottom_color>    
722                     
723     <footer_bottom_link_color>    
724     </footer_bottom_link_color>    
725                     
726     <footer_bottom_link_hover_color>    
727     </footer_bottom_link_hover_color>    
728                 
729    </footer>    
730                
731    <page>    
732                     
733     <custom>    
734      0    
735     </custom>    
736                     
737     <page_bgcolor>    
738     </page_bgcolor>    
739                     
740     <page_bg_image>    
741     </page_bg_image>    
742                     
743     <page_custom_style>    
744      <![CDATA[]]>    
745     </page_custom_style>    
746                 
747    </page>    
748                
749    <main>    
750                     
751     <custom>    
752      0    
753     </custom>    
754                     
755     <main_bgcolor>    
756     </main_bgcolor>    
757                     
758     <main_bg_image>    
759     </main_bg_image>    
760                     
761     <main_custom_style>    
762      <![CDATA[]]>    
763     </main_custom_style>    
764                 
765    </main>    
766            
767   </porto_design>    
768           
769   <mpsearch>    
770                
771    <general>    
772                     
773     <enabled>    
774      0    
775     </enabled>    
776                 
777    </general>    
778            
779   </mpsearch>    
780  </config>    
781 </root>